From 48584e17735c443dbe38c9ec4d7913420ff3fbc1 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 28 Apr 2006 14:48:50 +0100 Subject: [PATCH] xen/ia64 with dom0 vp model doesn't need the blkbkack ia64 workarounds any more. xen/ia64 dom0 vp model is a big change so that xen/ia64 with the old model (P=M) still remains as the compile option. Hopefully the work around will be eliminated in the future completely. Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c | 4 ++-- linux-2.6-xen-sparse/drivers/xen/blkback/interface.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index 3bae1313ed..8ed82df723 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -410,7 +410,7 @@ static void dispatch_rw_block_io(blkif_t *blkif, } pending_handle(pending_req, i) = map[i].handle; -#ifdef __ia64__ +#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP) pending_vaddrs[vaddr_pagenr(pending_req, i)] = (unsigned long)gnttab_map_vaddr(map[i]); #else @@ -546,7 +546,7 @@ static int __init blkif_init(void) blkif_interface_init(); -#ifdef __ia64__ +#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP) extern unsigned long alloc_empty_foreign_map_page_range( unsigned long pages); mmap_vstart = (unsigned long) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c index d82b9ebc3a..ac2b961490 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c @@ -74,7 +74,7 @@ static int map_frontend_page(blkif_t *blkif, unsigned long shared_page) blkif->shmem_ref = shared_page; blkif->shmem_handle = op.handle; -#ifdef __ia64__ +#if defined(__ia64__) && !defined(CONFIG_XEN_IA64_DOM0_VP) /* on some arch's, map_grant_ref behaves like mmap, in that the * passed address is a hint and a different address may be returned */ blkif->blk_ring_area->addr = gnttab_map_vaddr(op); -- 2.30.2